(setq ediff-window-setup-function 'ediff-setup-windows-plain)

(if (require 'ediff-trees nil t)
	(progn
	  (global-set-key (kbd "s-SPC") 'ediff-trees-examine-next)
	  (global-set-key (kbd "S-s-SPC") 'ediff-trees-examine-previous)
	  (global-set-key (kbd "C-s-SPC") 'ediff-trees-examine-next-regexp)
	  (global-set-key (kbd "C-S-s-SPC") 'ediff-trees-examine-previous-regexp)

	  (setq ediff-diff-options "-w")
	  (setq-default ediff-ignore-similar-regions t)
	  )
  )
(require 'ediff+ nil t)

(provide 'conf-ediff)